label: Parse new pango attributes

Support allow-breaks and show attributes.
These will be in pango 1.44

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 6c867eed71f759a289f5d1e2b6e18e483692d242..c82d01eead19a0851bb5931e31d6be9a003ed190 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1543,6 +1543,14 @@ attribute_from_text (GtkBuilder   *builder,
       if (gtk_builder_value_from_string_type (builder, G_TYPE_INT, value, &val, error))
         attribute = pango_attr_background_alpha_new ((guint16)g_value_get_int (&val));
       break;
+    case PANGO_ATTR_ALLOW_BREAKS:
+      if (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, value, &val, error))
+        attribute = pango_attr_allow_breaks_new (g_value_get_boolean (&val));
+      break;
+    case PANGO_ATTR_SHOW:
+      if (gtk_builder_value_from_string_type (builder, PANGO_TYPE_SHOW_FLAGS, value, &val, error))
+       attribute = pango_attr_show_new (g_value_get_flags (&val));
+      break;
     case PANGO_ATTR_INVALID:
     default:
       break;

diff --git a/testsuite/gtk/ui/label1.ui b/testsuite/gtk/ui/label1.ui
index e83b2dd60bb36b6fd03263d1132701d0bbcec7c9..5880714f170cef0d2df8f7f0a5eef4014da6fb92 100644 (file)
--- a/testsuite/gtk/ui/label1.ui
+++ b/testsuite/gtk/ui/label1.ui
@@ -20,6 +20,8 @@
       <attribute name="underline-color" value="green"/>
       <attribute name="strikethrough-color" value="purple"/>
       <attribute name="scale" value="1.5"/>
+      <attribute name="allow-breaks" value="true"/>
+      <attribute name="show" value="spaces|line-breaks"/>
     </attributes>
   </object>
 </interface>